From c6ca2374ccc60d57fc13afaa6264cce46462b144 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Sun, 30 Jun 2013 12:57:44 -0400 Subject: [PATCH] Deprecate and ignore gtk-im-status-style and gtk-im-preedit-style --- gtk/gtksettings.c | 14 ++++++++ modules/input/gtkimcontextxim.c | 59 +++------------------------------ 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 8f75eea0e5..ead90aaafd 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1438,6 +1438,13 @@ gtk_settings_class_init (GtkSettingsClass *class) NULL); g_assert (result == PROP_COLOR_PALETTE); + /** + * GtkSettings:gtk-im-preedit-style: + * + * How to draw the input method preedit string. + * + * Deprecated: 3.10: This setting is ignored. + */ result = settings_install_property_parser (class, g_param_spec_enum ("gtk-im-preedit-style", P_("IM Preedit style"), @@ -1448,6 +1455,13 @@ gtk_settings_class_init (GtkSettingsClass *class) gtk_rc_property_parse_enum); g_assert (result == PROP_IM_PREEDIT_STYLE); + /** + * GtkSettings:gtk-im-status-style: + * + * How to draw the input method statusbar. + * + * Deprecated: 3.10: This setting is ignored. + */ result = settings_install_property_parser (class, g_param_spec_enum ("gtk-im-status-style", P_("IM Status style"), diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 6a20b60e7f..e2be5b0f99 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -233,49 +233,6 @@ reinitialize_all_ics (GtkXIMInfo *info) reinitialize_ic (tmp_list->data); } -static void -status_style_change (GtkXIMInfo *info) -{ - GtkIMStatusStyle status_style; - - g_object_get (info->settings, - "gtk-im-status-style", &status_style, - NULL); - if (status_style == GTK_IM_STATUS_CALLBACK) - info->status_style_setting = XIMStatusCallbacks; - else if (status_style == GTK_IM_STATUS_NOTHING) - info->status_style_setting = XIMStatusNothing; - else if (status_style == GTK_IM_STATUS_NONE) - info->status_style_setting = XIMStatusNone; - else - return; - - setup_styles (info); - - reinitialize_all_ics (info); -} - -static void -preedit_style_change (GtkXIMInfo *info) -{ - GtkIMPreeditStyle preedit_style; - g_object_get (info->settings, - "gtk-im-preedit-style", &preedit_style, - NULL); - if (preedit_style == GTK_IM_PREEDIT_CALLBACK) - info->preedit_style_setting = XIMPreeditCallbacks; - else if (preedit_style == GTK_IM_PREEDIT_NOTHING) - info->preedit_style_setting = XIMPreeditNothing; - else if (preedit_style == GTK_IM_PREEDIT_NONE) - info->preedit_style_setting = XIMPreeditNone; - else - return; - - setup_styles (info); - - reinitialize_all_ics (info); -} - static void setup_styles (GtkXIMInfo *info) { @@ -324,16 +281,6 @@ setup_im (GtkXIMInfo *info) XNQueryICValuesList, &ic_values, NULL); - info->settings = gtk_settings_get_for_screen (info->screen); - info->status_set = g_signal_connect_swapped (info->settings, - "notify::gtk-im-status-style", - G_CALLBACK (status_style_change), - info); - info->preedit_set = g_signal_connect_swapped (info->settings, - "notify::gtk-im-preedit-style", - G_CALLBACK (preedit_style_change), - info); - info->supports_string_conversion = FALSE; if (ic_values) { @@ -357,8 +304,10 @@ setup_im (GtkXIMInfo *info) XFree (ic_values); } - status_style_change (info); - preedit_style_change (info); + info->status_style_setting = XIMStatusCallbacks; + info->preedit_style_setting = XIMPreeditCallbacks; + setup_styles (info); + reinitialize_all_ics (info); display = gdk_screen_get_display (info->screen); info->display_closed_cb = g_signal_connect (display, "closed", -- 2.30.2